Fix build after I removed test_assign_device from domctl union.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
index b392789d6623cd09ded6e05d263d3dc8fd0ebb68..e6eac869a841c0faee4cbc2762ae9b60adc9fbc4 100644 (file)
--- a/tools/libxc/xc_domain.c
+++ b/tools/libxc/xc_domain.c
@@ -772,7 +772,7 @@ int xc_test_assign_device(
 
     domctl.cmd = XEN_DOMCTL_test_assign_device;
     domctl.domain = domid;
-    domctl.u.test_assign_device.machine_bdf = machine_bdf;
+    domctl.u.assign_device.machine_bdf = machine_bdf;
 
     return do_domctl(xc_handle, &domctl);
 }

diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index 33f83de156458c4fce601abd5faba2f1fba68f71..1460f8e62085248a8b47a8af2571e5bc9493cf4c 100644 (file)
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -533,8 +533,8 @@ long arch_do_domctl(
         if ( !vtd_enabled )
             break;
 
-        bus = (domctl->u.test_assign_device.machine_bdf >> 16) & 0xff;
-        devfn = (domctl->u.test_assign_device.machine_bdf >> 8) & 0xff;
+        bus = (domctl->u.assign_device.machine_bdf >> 16) & 0xff;
+        devfn = (domctl->u.assign_device.machine_bdf >> 8) & 0xff;
 
         if ( device_assigned(bus, devfn) )
         {